bitkeeper revision 1.1159.170.32 (419a593aACa3uJybVvoEJ_gaJcjDwA)
authorkaf24@freefall.cl.cam.ac.uk <kaf24@freefall.cl.cam.ac.uk>
Tue, 16 Nov 2004 19:47:06 +0000 (19:47 +0000)
committerkaf24@freefall.cl.cam.ac.uk <kaf24@freefall.cl.cam.ac.uk>
Tue, 16 Nov 2004 19:47:06 +0000 (19:47 +0000)
Merge freefall.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/local/scratch/kaf24/xeno.bk


Trivial merge